Beta

//cc @russellholt @jagtalon  

Please review and approve :)