major changes to hand holding logic (ordering mostly)