-finished up framework