config changes
Make things class-based