added names to comments
make-able draft, not yet tested