Quite a lot of changes, mostly been tweaking parts to meet the spec and sorting out tables etc