fixing buggy refactor; all working except ordering
all basics working postrefactor! perf is not with current amount of elements, though