Cleaned up some poor encapsulation, fixed some bugs, cleaned up
printing, created test environment, and added Corset