this is temporary, but it captures a workable new layout