more gabe stuff
conflicts resolved