Mostly just added comments