working in progress. More layout more fun