Some minor rearchitecting done, a todo list is in podtimizer/scratch