Mechanics are done but sound and tidying/prettying it up to come tomorrow.