Updated dependencies, refatored, and started exploring templating