Starting to combine - OSX version now scales with window using autolayoutconstraints