I think coding is done? Needs some testing and refining