Not finished yet. Added some code mainly to the parser.