Added new functions. Also split files into Ray and Billy's programs