Moving more functions from wrapper to class
Moving more functions from wrapper to class
Moving more functions from wrapper to class and removing database_functions file