actually adapted methods to be useful, commented out select methods