Alspec s2.1

Campbell, please review my code.