Minor Reordening

Reordened some functions. Looking into Real Object possibilities.