This and That

Move stuff around, make some few changes, ect. ect.