clarified flesh_out branch
update flesh_out with latest logic
Merge branch 'flesh_out'