Renamed methods
Almost finished the parser - much of it not tested yet
Tests, fixes, also changed keywords and special tokens representation
from functions to objects