Cleaned up a bunch more, started restructuring stream