Pull Request

Adding docs, moved things around