Refactoring, adds basic rectangle drawing command