All major functionality with new syntax working. TODO: tests and resolution queries