Fixing Issue #58 (WIP)

You need to make this change in a lot of places below.