more fallout - this needs to be tested and refactord. :(