Started ability to delete blocks, cleaned some classes up