Updated MakeFile and added lots of parsing code