Adding the stuff I forgot to add + some extra new stuff.