moving to correct classes

- Need to add checks for flows