Commented classes ready for hand in and made new package