General Function Improvements 09:46 10/12/14