Add some unfinished parts