initial re-org
getting closer
yayyyy! it works