feature/remove_forms (rebased)

Rebasing #43 on develop for easier review.