Get simple working, fixes some bugs in timeouts but needs to be refined more
Merge branch 'feature-working-simple-example'