making everything more modular to deal with stuff properly