Commit changes I've been doing for the past couple weeks