Update 6
Everything except design and db