commit 1
more refactoring with j motherfucking foley