Version presented at the crit... not very happy with it, will try to find some time to maybe re-do it over the christmas break.