Renamed stuff and added some live code examples