continuing work on supporting standalone functions