Partial revert

Partially reverted the "overhauled framework" and added some
attachments.