messing around with markers and refactoring
Merge pull request #17 from cmarkel5/refactor_code

messing around with markers and refactoring