Some stuff added, but tests for class methods are not finished!