refactoring
pulled from remote and merged
commented out unfinished code
commented out unfinished code