Finish layout, lots work on routes, streamlined tests