Twerked the system a little to be more elegant and hopefully work.