Fixed up remaining points and server is starting to take shape