preliminary demos completed, need to do some cleaning up