current state of affairs
Merge pull request #15 from cmds4410/Connor

current state of affairs