added back CLI, have basic functionality working; time to make it pretty :x