Improved flow & added components for further testing/development