Completed

private project for tenfoldweb #8 pt2