New features ahoy. Closes #1