splitting things up, adding angular
tweaks