Framework completed - initial version