trying to update master with FINISHED THINGS