Moar
Refactoring, and some new figures