a couple more functions should now be functional