rebase to #27 so this isn't necessary please