More framework done