started #18
closes #17, continued #18
closes #33, closes #32