adding in some more stuff, still doesn't work yet