older things I forgot to commit
Merge pull request #1 from edmullen/old-changes

older things I forgot to commit