wip
progress
Sort of runs but I need a better sample now
Put it all together