95% done with version 2!!!!!!!!!!!!!!!!!