Some major refactorings

Updated collision detection, removed some hard coding, added
invincibility timer, updater timer locations to remove more from engine,
probably some other stuff