much update, much left to do