Add some stuff but not yet tested