Added calculated system now to the listing process. Handling charges need to be done.