Changed the style around a bit. Wrote some ideas down for V3...V0.3.