Galaxy integration

do not merge, work in progress