updated flow, now saving but still a bit bloated
updated flow, now saving, far less bloated