Busy making changes. FEATURES!