bugs 6 and 7
Bugs 4, 5, 6, and 7 done
Bugs 8 & 9
prep for settings