merged cc and h files. plenty of errors