Framework freeze

Closes #26