Refactored to a recursive descent parser
Removed pointless file
Revamping the fa system slowly