Just some final testing and some administrivia for these files
Just starting to move things around
Moving everything around to conform to requirements.