Commit of Luke's code as is