Re-write Initial Commit