Implemented Parser into Project, minor bug fix, works perfectly