Adding Todds enhancements

Oh hai beats bash on a Sunday