Nearly done

Signed-off-by: John Trembath <fudgebucket27@gmail.com>