Server fully functional, pull pls

Fetched all changes from your repo before requesting pull, only difference now is server folder