Updating stuff, adding tested stuff