[trevius]

I haven't tested it and don't really have time to, but was considering just committing it to get it in and fix any reported issues after (if any). I looked through it briefly and don't see any issues that stand out.