condenced everything into all one file and renamed it