Framework freeze

Closes #19