Feature/142 tiered capacitors

This seems to be working fine. Could everyone look over it and see if anything is missing?