UNFINISHED UPDATE PT 2