Pretty much done, some minor stuff left, maybe