Statics in, lots of new functionality
Some form formatting