Changed some things around

Made private members more clear
Added 2 functions
Extended class