Added basic platforms, more OOP