added playmaker to laptop, merging?