in progress of getting this fully functional