Reworked some things to make usage simpler.