pretty much done i think