working on merging new changes in.

Signed-off-by: Tom Green <kingofcuddles@gmail.com>