did a big refactor, let's see how everything is broken