Beta version complete; some additional testing needed