#60 Step 1-2 DONE
#85 Only feature to do is the save/submit bt