wip
Merge pull request #6 from tatums/wip

wip