Fix major bugs
Make classes more readable
Fix major bugs