worked on this offline

lots of stuff