Fixes #19

Still messy