little progress modulariozation