Mostly done debugging....