commiting before making big changes.
A few more updates.