Bugfix/issue 4

This branch has been going on for way too long -- need to make more targeted tickets and fix that way.