Normal commit, fixing things, making observe+shoot work and adding phase test in shoot