02282014_1

Revising code
some progress (incomplete)