initially finished, still have some ui work, and beautification, code clean up and unit testing to to