Written a fair bit more. Needs a review after a sleep on it.