Updated some files... ready for initial testing

Signed-off-by: Topher Donovan <themaskedcrusader@gmail.com>