Should now have docblocks for most stuff