Pretty much done with small refactoring. I probably won't go straight
into big refactoring. Want to make it actually do more stuff.