Moving a few additional functions into this module