major bugs remains but some data is working