Some routing, cleanup and getting rid of placeholders