Adding two more classes from unused Refactor and Redbean branches