#1312 Mostly done, flow working and just pending error handling