ReDo everything with new knowledge learned from old mistakes...Newer layout