Removed three interfaces which weren't doing any good and were making the 1D class...