+ Improved hash function to handle environments
+ Started work on #8