Commented out unfinished customer stuff