[WIP] Initial merge

DO NOT MERGE THIS YET