commentd out unfinished parts of goodbye-master