Accessors

Feel free to discuss if commits should be squashed, or some more fixes required.