Re-arrange + finish up functionality