Continued Development

I've been iterating on this every so often to add some new features and just make it nicer, I believe one line might need to be modified (as it points to my repo in said line)  which would be line 422. 

Hopefully you look at this,
thanks,
Joshua Theze