Did some more work, overall very messy.