Final copy

This is the final copy. All that will go in after this point is very
critical bug fixes