Working state, still got lots of debug stuff to clean up