Shuffle some stuff around
Add foolz