added a bunch of stuff - still doesn't work