Iterative commit because I might be making some big changes.