Serve Integration Part 1

Change-Id: I2f75330ac42eac9388aa4a8218b14db904ab3e07
Signed-off-by: UnbrandedTech <james.kenaley1@gmail.com>