development in progress
1st iteration
design doc
test
some missing changes