i think it's mostly finished now