Fixed a few bugs and have the basic flow working better