Still the functions are global (not under a package). Needs more organization!