Some more changes... Blocks will need to be refactored