Fixed lots, tests working, moving again