Fixes #16, Tons of work