"Guti" branch created

Test branch with entire new layout