Huge code refractor

What do you know? A bunch of stuff finally works...