Really adding everything this time