Allow lines to be drawn + move functions from rect to shape