Initial commit for completed code