Think I fixed some dependency issues and refactored a bit. Everything seems to be working as expected now.