Add some more code to solutions - basic Classes