Initial MVP infrastructure stuffed in (need to be structured into packages).