Add more tests and start implementation code
Add environment object