First implem of beer and nice refactor on modules