Added new layout and tried to do the Geo stuff