Started to move code into seperate parser files