Added calculate method and Markup enum, added test for calculating flat markup