sort of finished, now done with step 15. Need to verify all features work