more refactors
working again