stuff
solidifying structure
fixing merge