Updated to use sin/cos rather than calculate a circle... works much better...