Made some slight changes to the makefile
Done some major changes and added parsing of messages and source