working on setup: #MSG-322 In Progress