First pass at setup
deploy fixes