Made A LOT of changes again, but at least some stuff worked.