Some cleanup and work on getting a "UI" of sorts