Switched back over to models for the blocks