This adds in multiband stuff (hopefully) also closes #4