Dev 1.0 First Pull Request

{ of this class should be on the next line :bow: 

Then please indent all other blocks of code inside this class :dart: