Work on modules, add install closure feature