Edit out order of elements

Too buggy. Will re-implement later.