Adding a bit of documentation, merging down to dev