Mostly ready for deployment