Got tenors and seconds working. Also refactored code a bunch to make scaling work.