updated to remove Spark but use it's components

Signed-off-by: Rick <rick@cheekymonkeymedia.ca>