First stab at ripping out angle code!