Extended Initial Commit