Premature commit in order to get work on laptop.