We've accumulated a lot of technical debt in the last few releases, it's probably worth addressing those at some point.