some more basic work but i have to sleep now