finished partitial refactoring for main classes, added new wishlist for features