more features but not much progess...classBased