These additions will require pep8 changes