Make it modular
Add official solutions