Fix a *minor* bug && initialize rearrange.
ermagherd moments...

this was causing build to not boot :(
Lets see if this works ;)