Stec

The stec branch isn't ready to pull yet, I'm creating a request to make it easier to look at.