Small restructure, modified TODO
Merge branch 'master' of https://github.com/benlast/grimace
Allowed attribute invocation of most methods, extended tests