Still have Lots to organize but this is a more sane version...

Signed-off-by: captain_shadows <captain_shadows@aol.com>