+ reorganized the structure a bit (still learning how to do this properly)