ready for testing

sans the fileserver part