Commit #2 From ibJarrett- (OCD WENT CRAZY! Had to rearrange some stuff.)