split things into components

really considering a reboot.....