Not done yet, but the important stuff is here