Progress...sorry for the lame commit. :P