Huge progress, almost done with layout