More features and some tweaking.
OMG MERGE!
Merge branch 'master' of https://github.com/dotBunny/Hydrogen

# By Robin Southern
# Via Robin Southern
* 'master' of https://github.com/dotBunny/Hydrogen:
  Namespace whoopsie