Current working state... Corrected the addtional calculatiosn to the net not gross
