Fleshed out declarations further, most accessors