Refactored a few things. Looks like I FINALLY worked out the angle thing :P