Beta

Merge from beta branch. Very basic functionality at this stage.