model updates
major server rewrites