added some crap
trying to work with this merge