Inching towards the right infrastructure.

Signed-off-by: William Raiford <bill.mybiz@gmail.com>