added some unfinished stuff