Moved files back into PrototypeBranch. Currently not working:
Logging is non-functional