added modularity
Fixed merge stuff
Fixed merge stuff