Commit this while I'm in the middle of it because I'm really happy with it so far and I don't want to lose it. ;)