WIP, 2nd one...basic functionality restored