Sore work on fixing #24