(Src) : progress

refactoring and progress work.