Initial setup pushed. WS in progress...