Okay, this needs to get audited before any merge.