starting to work on creating a different way to expand incoming/outgoing
Merge remote-tracking branch 'origin/master'