Got +xpreq/cost working

Still too much code repetition.