Final commit for the day. i really mean it this time. except for the ones I'll commit later...