Updated Server V.0.7

Almost complete