well i managed to make all the stuff work in a single commit