Making progress

need to combine while and if/elif/else loops