refacterin
getting caught up with commiting changes