Completed programmer work part 1