Need to switch machines. This is gunna be a fairly messy commit