finish basic layouts and routes
merging issues?