Initial commit of updated setup and code.