starting refactor to saltwater and octobinder