Okay, accidentally posted this early.... so consider it a wip for now.