Implement functionality for regular SIP

Abstracted out functionality for computing returns & risk, also
incorporated code improvements