Beta3

Meant to do this a while ago.