Slight rework and adding a simple sample