Separated things, for easier testing
Not even one test is passing yet