beta v. 0.3 - have basic functionality working