Making it into a module