Got rid of unnecessary abstraction, maybe... we'll see later