Current code

What we have implemented