Added samples, updated and expanded with additional functionality