Done - kinda - i think.