Improve everything
Add a simple test simulation