refactor to basics done. Test runs, no wranings