Moved a couple of functions around. Added getter and setter for status. etc.