Feature/jstricker/move commands and blocks