Worked out solve scene issues, fully integrated
Oh the cleanup...