Shapes are now sort of selectable and movable

Contains some minor bugs