Improved Greatly

Updated to be more useful.