Demo updated, OAD work in progress