Nearly done building server package!
merged stuff