Sammy sick rage dev

Hopefully this one shouldn't have any extra commits :)