added couple more functions --need to clean out function names and fix
bad unit tests approach as well