Changing stuff towards using Models instead of Blocks