pushing et paul

some things changed, working on it