Initial commit of code, working