Adding getter/setters and more complete specs (WIP)