almost ready to test
more changes
added better data handling
everything is working well