Solved #69 ...tho it needs to be refactored. It is painfully slow.