v1.1.0 - big overhaul and cleanup