Started work on combining functions into one program