Initial commit of completed code