Topology re-done

Signed-off-by: Marvis Okungbowa <mokungbowa@gmail.com>