Reworked Accessors; things seem more stable now