more hacking, not working yet