Add ointment and exp to Hartshire
Make some code more efficient