added a bunch to parser; doesnt compile yet... -sai