Feature/bandedo/refactor

Lots of shit.