Add WAS features. Closes #12