mostly done but for a bug