- created proposal type and refactored calculation with it.

close #2