Hamfisted approach to dealing with the stupid history handling. Closes #30 & #29