Design 99% done. Beginning work on cleanup
Code clean up