*sigh* I should commit changes more often...