Made code ready for lightning talk, failing tests are running with the fastes and dirtiest hack ever