Lunch time hack project coming along nicely. Just needs a bit of tidying up