Commit 3: Major Design Change