IMPORTANT COMMIT, THESE ARE MY REAPPLIED CHANGES AFTER I REALIZED I MESSED UP 3/6/14