Basic flow complete, needs testing