Fragment overhaul

This is what I meant to do... Woops.