Refactored how values are set and get.. more work to be done soon.