First 3 pages working almost fully - still tweaking cutter
Fixing merge issues with upload.html