Fixed and updated to honour lifetimes
Updated to SM3 and removed demo project