Finished adding 45% of code from public server