Feature/hydrasir 218

I think I cleaned up the commit and this should be easy to merge.