wip
merging with macbook