beta.1 still needs refactor