Little bit more work

Needs tidying but works okay