Feat569

Ok, I know this may be premature because everything may not be in the proper place, but it's ready to be tested, so I'm submitting the pull request.