Reordering stuff, got input from a friend..