Initial commit beta 3.0

Initial commit for current beta 3.0