[dev]minimal work
[dev]minimal refactor