Mostly done and should be ready for presenation