Fixes #4 - Removed some define method stuff