changes

*tweaked: Seperated Logic and Render from Core class