adding some stuff that doesn't work yet