some cleanup required; ready to make the fs rock