Worked on combining code, debug