Started to add Static data, moved some of the other stuff into its own namespace.