Pretty much done. That was easier that I thought