More hacks. make finishes but nothing is linked correctly.