WIP, UNTESTED, fix for the "else" statement bugs.