Working add / routing features. No formatting except for forms