changed to using states, create bucket service and api