Rework things to make it more useful

Time to update this heavily for everyone.