Continue building out some features as needed