inserting logic finished #79
retrieve finished, doing tests, in progress #79