added a few things, none of which will work atm :(