Cleaning up some classes
Much improved visuals, legends, new options that can be passed but need defaults