buncha changes, still doesn't work yet