Still need to finish thie...

Signed-off-by: Anthony Anderson <LordIllyohs@gmail.com>