much progress, such stuffs. need to commit more often as usual lol