More like this

Starting to implement this, don't really know what I'm doing but it is starting to return results...

Not ready for merging, just looking for feedback...