Lots of fixes, but nowhere near stable atm
Holy merge conflicts batman