code sorted, need to fix up testing then build and deploy