Broke out a few more interfaces. Battle was getting large.