WIP - working through deployment