Completely reorganized these and will continue to do so until I figure things out