Fixing Issue #58 (WIP)

This is @sedge's stuff that got merged with mine. Could not answer for him on this one...