Added block placement!

More refactoring to new handlers