Major refactor to accommodate the concept of instanciable injectable dependencies