Mostly done.git Time to debug