Fill in layout, Refactor tests and routes, Add new user skeleton