i hava shitton of work in a branch that i will hopefully rebase soon