Added BBG_Theory's suggestion
-Also, some forward thinking™ for #23