Added everything im comfortable with and should be ready for a merge into master

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