wip
Merge pull request #2 from chasetopher/wip

wip