[#27] Missed adding all code in previous commit, adding it now....