Ross work

i believe i got everything you changed.
reminder: do not add include inside cpp files, only at the .h