properties, method support for tokens (needs tests)
merge from bb (needs tests)
improved reload_test -- http://stackoverflow.com/questions/22943544