WIP:Galaxy #2

Draft
scooper wants to merge 1 commits from master into new_branch