Issue #33 -- removing for now, may make part of framework later