Fixed silly error not utilizing self reference...
And another... GAH.