Progress

Still having way too much fun working through this edit...