Got it working for the most part, need to clean up
Figuring how to make all this work for my project structure