This is just a modified version of #1273 with concerns from @Will Jones addressed. I will really appreciate it if we can get this reviewed and merged soon..