cleaned up some things.
Cleaned up. About to implement UI.