Removed method, updated variables, updated setters in preparation for daemon