Removed demo, moved options version into new branch