Massive code Clean Up. Initial works on version check

And 2 new blocks.