new layout, basic stuff initiated, still very much work in progress