Severe updates

Finally getting onto the server