Code reworked
Reworked in different files
Merge branch 'testEnv'

The master was behind after I tested all in testEnv I wanted to merge but there were alot of chagnes