Pretty much done now, only a few little things left