major overhaul of grammar, types added, more to come soon