New commit of working files as of April 22nd, 2014