Blocks and Entities

I failed a bit on my previous pull request. So here I go again.

Extending Block Class and adding a Entity class framework