Updated methods

Pretty much re-wrote these
Push