Change Set 2

Removed LOTS of unneeded code due to polymorphism :D