updated controllers for new flow
updated ds store?
commit