Initial commit of Daniel's code.