Move to vector calculations for skeleton

Still work to be done, but a start.