Everything works fine, just make it modular