Add more variables
Implement some stuff