Continued work adding generic functions to the PropWare namespace