first commit including already implemented modules