New small functions.  More masters.  FS testing.