Updating system design

Needs simplified, this is getting out of hand.