#16 | slightly refactored state service and repo to accomodate update